Bug 559947 – Unchecked dependency on python>=2.4

2008-11-25  Johan Dahlin  <jdahlin@async.com.br>

    Bug 559947 – Unchecked dependency on python>=2.4

    * gtk/gtk-builder-convert:
    Avoid using sorted() which is only present in python 2.

svn path=/trunk/; revision=21807

diff --git a/ChangeLog b/ChangeLog
index 17fdba023c1d0c522014a4f29cc2c33f6d15363f..e74727b1ac92e9794f8d5e2b2d1579f25b9a0314 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-11-25  Johan Dahlin  <jdahlin@async.com.br>
+
+       Bug 559947 – Unchecked dependency on python>=2.4
+
+       * gtk/gtk-builder-convert:
+       Avoid using sorted() which is only present in python 2.
+
 2008-11-24  Tristan Van Berkom <tvb@gnome.org>
 
        * gtk/gtkalignment.c: Bug 561539 - Fix warnings when size allocations

diff --git a/gtk/gtk-builder-convert b/gtk/gtk-builder-convert
index 79c9e4ee127eb99f2296af07755a097058b05522..470e206de13bafb2d08d6e66dfb789f88aadd77d 100755 (executable)
--- a/gtk/gtk-builder-convert
+++ b/gtk/gtk-builder-convert
@@ -269,9 +269,14 @@ class GtkBuilderConverter(object):
 
         # Output the newly created root objects and sort them
         # by attribute id
-        for obj in sorted(self.root_objects,
-                          key=lambda n: n.getAttribute('id'),
-                          reverse=True):
+        # FIXME: Use sorted(self.root_objects,
+        #                   key=lambda n: n.getAttribute('id'),
+        #                   reverse=True):
+        # when we can depend on python 2.4 or higher
+        root_objects = self.root_objects[:]
+        root_objects.sort(lambda a, b: cmp(b.getAttribute('id'),
+                                           a.getAttribute('id')))
+        for obj in root_objects:
             self._interface.childNodes.insert(0, obj)
 
     def _convert(self, klass, node):